[XEND] Keep vif IP addresses as space separated string.

They were inconsistently represented as strings or lists making it
difficult to know the type of the IP parameter for vifs. Since both xm
and DevController represents these as space separated strings, that is
what it will be stored as.

Signed-off-by: Alastair Tse <atse@xensource.com>

diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py
index af2971a870d305009feabf52f22cefd55a192ade..804a50209c888b40aff4b2a5c574b0f2e81f9f52 100644 (file)
--- a/tools/python/xen/xend/XendConfig.py
+++ b/tools/python/xen/xend/XendConfig.py
@@ -922,24 +922,11 @@ class XendConfig(dict):
             except ValueError:
                 pass # SXP has no options for this device
 
-
-            # Special handling for certain device parameters.
-
-            def _get_config_ipaddr(cfg):
-                val = []
-                for ipaddr in sxp.children(cfg, elt='ip'):
-                    val.append(sxp.child0(ipaddr))
-                return val
-
-            if dev_type == 'vif' and 'ip' in dev_info:
-                dev_info['ip'] = _get_config_ipaddr(config)
-
             if dev_type == 'vbd':
                 if dev_info.get('dev', '').startswith('ioemu:'):
                     dev_info['driver'] = 'ioemu'
                 else:
                     dev_info['driver'] = 'paravirtualised'
-                    
 
             # create uuid if it doesn't exist
             dev_uuid = dev_info.get('uuid', uuid.createString())

diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py
index a20929a0d90f8762c1a049cda092823c6f1749f1..8b0a2ce66c3dcd9da7d7ad7afcd0c6e2d3e6276d 100644 (file)
--- a/tools/python/xen/xend/server/netif.py
+++ b/tools/python/xen/xend/server/netif.py
@@ -164,7 +164,7 @@ class NetifController(DevController):
             front = { 'handle' : "%i" % devid,
                       'mac'    : mac }
         if ipaddr:
-            back['ip'] = ' '.join(ipaddr)
+            back['ip'] = ipaddr
         if bridge:
             back['bridge'] = bridge
         if vifname:
@@ -189,7 +189,7 @@ class NetifController(DevController):
             network_script_dir = xroot.network_script_dir + os.sep
             result['script'] = script.replace(network_script_dir, "")
         if ip:
-            result['ip'] = ip.split(" ")
+            result['ip'] = ip
         if bridge:
             result['bridge'] = bridge
         if mac: